From 3b8cbbe030f2821f8e64747e2aad64b5a3bca72c Mon Sep 17 00:00:00 2001 From: tateisu Date: Sun, 11 Mar 2018 01:22:13 +0900 Subject: [PATCH] =?UTF-8?q?=E7=B5=B5=E6=96=87=E5=AD=97=E3=81=AE=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=BC=E3=83=88=E3=82=B3=E3=83=BC=E3=83=89=E8=A7=A3?= =?UTF-8?q?=E9=87=88=E6=99=82=E3=81=AB=E3=82=AB=E3=82=B9=E3=82=BF=E3=83=A0?= =?UTF-8?q?=E7=B5=B5=E6=96=87=E5=AD=97=E3=82=92=E5=84=AA=E5=85=88=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jp/juggler/subwaytooter/ActMain.kt | 10 ++-- .../java/jp/juggler/subwaytooter/ActPost.kt | 49 +++++++++---------- .../subwaytooter/util/CustomEmojiLister.kt | 13 +++++ .../juggler/subwaytooter/util/EmojiDecoder.kt | 48 +++++++++++------- .../juggler/subwaytooter/util/PostHelper.kt | 12 +++-- 5 files changed, 79 insertions(+), 53 deletions(-) diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt b/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt index 8de39227..26baebee 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/ActMain.kt @@ -634,6 +634,8 @@ class ActMain : AppCompatActivity() post_helper.bNSFW = false post_helper.in_reply_to_id = - 1L post_helper.attachment_list = null + post_helper.emojiMapCustom = App1.custom_emoji_lister.getMap(account.host) + etQuickToot.hideKeyboard() @@ -1599,7 +1601,7 @@ class ActMain : AppCompatActivity() try { val dataId = sv.substring(3).toLong(10) val sa = SavedAccount.loadAccount(this@ActMain, dataId) - ?: return TootApiResult("missing account db_id=" + dataId) + ?: return TootApiResult("missing account db_id=$dataId") this.sa = sa client.account = sa } catch(ex : Throwable) { @@ -1627,11 +1629,11 @@ class ActMain : AppCompatActivity() val host = this.host val ta = this.ta var sa = this.sa - - if( ta != null && host != null && sa == null ){ + + if(ta != null && host != null && sa == null) { val user = ta.username + "@" + host // アカウント追加時に、アプリ内に既にあるアカウントと同じものを登録していたかもしれない - sa = SavedAccount.loadAccountByAcct( this@ActMain,user ) + sa = SavedAccount.loadAccountByAcct(this@ActMain, user) } afterAccountVerify(result, ta, sa, host) diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt b/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt index f8c81be0..cd8f7323 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/ActPost.kt @@ -549,11 +549,11 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba // 今回メンションを追加する？ val who_acct = account.getFullAcct(reply_status.account) - if(mention_list.contains("@" + who_acct)) { + if(mention_list.contains("@$who_acct")) { // 既に含まれている } else if(! account.isMe(reply_status.account) || mention_list.isEmpty()) { // 自分ではない、もしくは、メンションが空 - mention_list.add("@" + who_acct) + mention_list.add("@$who_acct") } val sb = StringBuilder() @@ -729,7 +729,6 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba findViewById(R.id.etChoice2), findViewById(R.id.etChoice3), findViewById(R.id.etChoice4) - ) tvCharCount = findViewById(R.id.tvCharCount) @@ -835,6 +834,12 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba btnAccount.setBackgroundResource(R.drawable.btn_bg_transparent) } else { post_helper.setInstance(a.host) + + // 先読みしてキャッシュに保持しておく + App1.custom_emoji_lister.getList(a.host) { + // 何もしない + } + val acct = a.acct val ac = AcctColor.load(acct) val nickname = if(AcctColor.hasNickname(ac)) ac.nickname else acct @@ -1158,7 +1163,7 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba TootApiClient.MEDIA_TYPE_JSON, body_string ) val request_builder = Request.Builder().put(request_body) - val result = client.request("/api/v1/media/" + attachment_id, request_builder) + val result = client.request("/api/v1/media/$attachment_id", request_builder) new_attachment = parseItem(::TootAttachment, result?.jsonObject) return result } @@ -1240,6 +1245,7 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba internal interface InputStreamOpener { val mimeType : String + @Throws(IOException::class) fun open() : InputStream @@ -1276,7 +1282,6 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba break } - cache_dir.mkdir() val temp_file = File(cache_dir, "tmp." + Thread.currentThread().id) @@ -1288,7 +1293,7 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba } } - return object : ActPost.InputStreamOpener { + return object : InputStreamOpener { override val mimeType : String get() = mime_type @@ -1314,6 +1319,7 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba break } + return object : InputStreamOpener { override val mimeType : String @@ -1646,40 +1652,29 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba private fun performMore() { val dialog = ActionsDialog() - dialog.addAction( - getString(R.string.open_picker_emoji) - ) { + dialog.addAction(getString(R.string.open_picker_emoji)) { post_helper.openEmojiPickerFromMore() } - - dialog.addAction( - getString(R.string.clear_text) - ) { + dialog.addAction(getString(R.string.clear_text)) { etContent.setText("") etContentWarning.setText("") } - dialog.addAction( - getString(R.string.clear_text_and_media) - ) { + dialog.addAction(getString(R.string.clear_text_and_media)) { etContent.setText("") etContentWarning.setText("") attachment_list.clear() showMediaAttachment() } - if(PostDraft.hasDraft()) { - dialog.addAction( - getString(R.string.restore_draft) - ) { openDraftPicker() } + if(PostDraft.hasDraft()) dialog.addAction(getString(R.string.restore_draft)) { + openDraftPicker() } - dialog.addAction( - getString(R.string.recommended_plugin) - ) { showRecommendedPlugin(null) } - - + dialog.addAction(getString(R.string.recommended_plugin)) { + showRecommendedPlugin(null) + } dialog.show(this, null) } @@ -1723,6 +1718,8 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba post_helper.attachment_list = this.attachment_list + post_helper.emojiMapCustom = App1.custom_emoji_lister.getMap(account.host) + post_helper.post(account, false, false) { target_account, status -> val data = Intent() data.putExtra(EXTRA_POSTED_ACCT, target_account.acct) @@ -1884,7 +1881,7 @@ class ActPost : AppCompatActivity(), View.OnClickListener, PostAttachment.Callba api_client.account = account if(in_reply_to_id != - 1L) { - val result = api_client.request("/api/v1/statuses/" + in_reply_to_id) + val result = api_client.request("/api/v1/statuses/$in_reply_to_id") if(isCancelled) return null val jsonObject = result?.jsonObject if(jsonObject == null) { diff --git a/app/src/main/java/jp/juggler/subwaytooter/util/CustomEmojiLister.kt b/app/src/main/java/jp/juggler/subwaytooter/util/CustomEmojiLister.kt index f4405417..ce0849ba 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/util/CustomEmojiLister.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/util/CustomEmojiLister.kt @@ -11,6 +11,7 @@ import java.util.concurrent.ConcurrentLinkedQueue import jp.juggler.subwaytooter.App1 import jp.juggler.subwaytooter.api.entity.CustomEmoji import jp.juggler.subwaytooter.api.entity.parseList +import java.util.HashMap class CustomEmojiLister(internal val context : Context) { @@ -105,6 +106,18 @@ class CustomEmojiLister(internal val context : Context) { return null } + fun getMap(host : String) : HashMap? { + val list = getList(host,{ + // 遅延ロード非対応 + }) ?: return null + // + val dst = HashMap() + for( e in list){ + dst[e.shortcode] = e + } + return dst + } + private inner class Worker : WorkerBase() { override fun cancel() { diff --git a/app/src/main/java/jp/juggler/subwaytooter/util/EmojiDecoder.kt b/app/src/main/java/jp/juggler/subwaytooter/util/EmojiDecoder.kt index 30662dac..08894d2c 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/util/EmojiDecoder.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/util/EmojiDecoder.kt @@ -13,10 +13,12 @@ import java.util.ArrayList import jp.juggler.subwaytooter.App1 import jp.juggler.subwaytooter.Pref import jp.juggler.subwaytooter.R +import jp.juggler.subwaytooter.api.entity.CustomEmoji import jp.juggler.subwaytooter.span.EmojiImageSpan import jp.juggler.subwaytooter.span.HighlightSpan import jp.juggler.subwaytooter.span.NetworkEmojiSpan import jp.juggler.subwaytooter.table.HighlightWord +import java.util.HashMap import java.util.regex.Pattern object EmojiDecoder { @@ -245,23 +247,6 @@ object EmojiDecoder { } override fun onShortCode(part : String, name : String) { - // 通常の絵文字 - val info = EmojiMap201709.sShortNameToImageId[name.toLowerCase().replace('-', '_')] - if(info != null) { - builder.addImageSpan(part, info.image_id) - return - } - - // カスタム絵文字 - val emojiCustom = emojiMapCustom?.get(name) - if(emojiCustom != null) { - val url = when { - Pref.bpDisableEmojiAnimation(App1.pref) && emojiCustom.static_url?.isNotEmpty() == true -> emojiCustom.static_url - else -> emojiCustom.url - } - builder.addNetworkEmojiSpan(part, url) - return - } // フレニコのプロフ絵文字 if(emojiMapProfile != null && name.length >= 2 && name[0] == '@') { @@ -274,6 +259,24 @@ object EmojiDecoder { } } } + + // カスタム絵文字 + val emojiCustom = emojiMapCustom?.get(name) + if(emojiCustom != null) { + val url = when { + Pref.bpDisableEmojiAnimation(App1.pref) && emojiCustom.static_url?.isNotEmpty() == true -> emojiCustom.static_url + else -> emojiCustom.url + } + builder.addNetworkEmojiSpan(part, url) + return + } + + // 通常の絵文字 + val info = EmojiMap201709.sShortNameToImageId[name.toLowerCase().replace('-', '_')] + if(info != null) { + builder.addImageSpan(part, info.image_id) + return + } when { reHohoemi.matcher(name).find() -> builder.addImageSpan( @@ -297,7 +300,7 @@ object EmojiDecoder { // 投稿などの際、表示は不要だがショートコード=>Unicodeの解決を行いたい場合がある // カスタム絵文字の変換も行わない - fun decodeShortCode(s : String) : String { + fun decodeShortCode(s : String ,emojiMapCustom : HashMap? =null ) : String { val sb = StringBuilder() @@ -307,6 +310,15 @@ object EmojiDecoder { } override fun onShortCode(part : String, name : String) { + + // カスタム絵文字にマッチするなら変換しない + val emojiCustom = emojiMapCustom?.get(name) + if(emojiCustom != null) { + sb.append(part) + return + } + + // カスタム絵文字ではなく通常の絵文字のショートコードなら絵文字に変換する val info = EmojiMap201709.sShortNameToImageId[name.toLowerCase().replace('-', '_')] sb.append(info?.unified ?: part) } diff --git a/app/src/main/java/jp/juggler/subwaytooter/util/PostHelper.kt b/app/src/main/java/jp/juggler/subwaytooter/util/PostHelper.kt index 2e1dd17b..07e5df79 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/util/PostHelper.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/util/PostHelper.kt @@ -35,6 +35,7 @@ import jp.juggler.subwaytooter.table.TagSet import jp.juggler.subwaytooter.view.MyEditText import okhttp3.Request import okhttp3.RequestBody +import java.util.HashMap class PostHelper( private val activity : AppCompatActivity, @@ -71,6 +72,7 @@ class PostHelper( var in_reply_to_id : Long = 0 var attachment_list : ArrayList? = null var enquete_items : ArrayList? = null + var emojiMapCustom : HashMap? =null fun post( account : SavedAccount, @@ -221,12 +223,12 @@ class PostHelper( val json = JSONObject() try { - json.put("status", EmojiDecoder.decodeShortCode(content)) + json.put("status", EmojiDecoder.decodeShortCode(content,emojiMapCustom=emojiMapCustom)) if(visibility_checked != null) { json.put("visibility", visibility_checked) } json.put("sensitive", bNSFW) - json.put("spoiler_text", EmojiDecoder.decodeShortCode(spoiler_text ?: "")) + json.put("spoiler_text", EmojiDecoder.decodeShortCode(spoiler_text ?: "",emojiMapCustom=emojiMapCustom)) json.put( "in_reply_to_id", if(in_reply_to_id == - 1L) null else in_reply_to_id @@ -242,7 +244,7 @@ class PostHelper( json.put("isEnquete", true) array = JSONArray() for(item in enquete_items) { - array.put(EmojiDecoder.decodeShortCode(item)) + array.put(EmojiDecoder.decodeShortCode(item,emojiMapCustom=emojiMapCustom)) } json.put("enquete_items", array) } catch(ex : JSONException) { @@ -258,7 +260,7 @@ class PostHelper( val sb = StringBuilder() sb.append("status=") - sb.append(EmojiDecoder.decodeShortCode(content).encodePercent()) + sb.append(EmojiDecoder.decodeShortCode(content,emojiMapCustom=emojiMapCustom).encodePercent()) if(visibility_checked != null) { sb.append("&visibility=") @@ -271,7 +273,7 @@ class PostHelper( if(spoiler_text?.isNotEmpty() == true) { sb.append("&spoiler_text=") - sb.append(EmojiDecoder.decodeShortCode(spoiler_text).encodePercent()) + sb.append(EmojiDecoder.decodeShortCode(spoiler_text,emojiMapCustom=emojiMapCustom).encodePercent()) } if(in_reply_to_id != - 1L) {