gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 19

Change: #398 管理者設定：スタンプのストリーミングを有効にする設定→ローカルユーザーの絡むスタンプのストリーミングを有効にする (#414)

Browse source
This commit is contained in:
KMY（雪あすか） 2024-01-04 08:35:47 +09:00 • committed by GitHub
parent 37bc3c6171
commit 5d8a9f4757
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/lib/activitypub/activity/like.rb
View file

@ -156,7 +156,7 @@ class ActivityPub::Activity::Like < ActivityPub::Activity
emoji_group = @original_status.emoji_reactions_grouped_by_name(nil, force: true)
.find { |reaction_group| reaction_group['name'] == emoji_reaction.name && (!reaction_group.key?(:domain) || reaction_group['domain'] == emoji_reaction.custom_emoji&.domain) }
emoji_group['status_id'] = @original_status.id.to_s
DeliveryEmojiReactionWorker.perform_async(render_emoji_reaction(emoji_group), @original_status.id, emoji_reaction.account_id) if Setting.streaming_emoji_reaction && (@original_status.local? || Setting.streaming_other_servers_emoji_reaction)
DeliveryEmojiReactionWorker.perform_async(render_emoji_reaction(emoji_group), @original_status.id, emoji_reaction.account_id) if @original_status.local? ? Setting.streaming_local_emoji_reaction : Setting.streaming_other_servers_emoji_reaction
end
def render_emoji_reaction(emoji_group)

2
app/lib/activitypub/activity/undo.rb
View file

@ -163,7 +163,7 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity
emoji_group = { 'name' => emoji_reaction.name, 'count' => 0, 'account_ids' => [], 'status_id' => @original_status.id.to_s }
emoji_group['domain'] = emoji_reaction.custom_emoji.domain if emoji_reaction.custom_emoji
end
DeliveryEmojiReactionWorker.perform_async(render_emoji_reaction(emoji_group), @original_status.id, emoji_reaction.account_id) if Setting.streaming_emoji_reaction && (@original_status.local? || Setting.streaming_other_servers_emoji_reaction)
DeliveryEmojiReactionWorker.perform_async(render_emoji_reaction(emoji_group), @original_status.id, emoji_reaction.account_id) if @original_status.local? ? Setting.streaming_local_emoji_reaction : Setting.streaming_other_servers_emoji_reaction
end
def render_emoji_reaction(emoji_group)

4
app/models/form/admin_settings.rb
View file

@ -47,7 +47,7 @@ class Form::AdminSettings
authorized_fetch
receive_other_servers_emoji_reaction
streaming_other_servers_emoji_reaction
streaming_emoji_reaction
streaming_local_emoji_reaction
enable_emoji_reaction
check_lts_version_only
enable_public_unlisted_visibility
@ -79,7 +79,7 @@ class Form::AdminSettings
authorized_fetch
receive_other_servers_emoji_reaction
streaming_other_servers_emoji_reaction
streaming_emoji_reaction
streaming_local_emoji_reaction
enable_emoji_reaction
check_lts_version_only
enable_public_unlisted_visibility

2
app/services/emoji_react_service.rb
View file

@ -37,7 +37,7 @@ class EmojiReactService < BaseService
create_notification
notify_to_followers
increment_statistics
write_stream! if Setting.streaming_emoji_reaction
write_stream! if Setting.streaming_local_emoji_reaction
@emoji_reaction
end

2
app/services/un_emoji_react_service.rb
View file

@ -15,7 +15,7 @@ class UnEmojiReactService < BaseService
create_notification(emoji_reaction) if !@status.account.local? && @status.account.activitypub?
notify_to_followers(emoji_reaction)
write_stream(emoji_reaction) if Setting.streaming_emoji_reaction
write_stream(emoji_reaction) if Setting.streaming_local_emoji_reaction
relay_for_undo_emoji_reaction!(emoji_reaction)
relay_friend_for_undo_emoji_reaction!(emoji_reaction)

2
app/views/admin/settings/discovery/show.html.haml
View file

@ -35,7 +35,7 @@
= f.input :enable_emoji_reaction, as: :boolean, wrapper: :with_label, kmyblue: true, hint: false
.fields-group
= f.input :streaming_emoji_reaction, as: :boolean, wrapper: :with_label, kmyblue: true
= f.input :streaming_local_emoji_reaction, as: :boolean, wrapper: :with_label, kmyblue: true
.fields-group
= f.input :receive_other_servers_emoji_reaction, as: :boolean, wrapper: :with_label, kmyblue: true

5
config/locales/simple_form.en.yml
View file

@ -113,8 +113,7 @@ en:
site_terms: Use your own privacy policy or leave blank to use the default. Can be structured with Markdown syntax.
site_title: How people may refer to your server besides its domain name.
status_page_url: URL of a page where people can see the status of this server during an outage
streaming_emoji_reaction: If the server load is high, try unchecking the box temporarily.
streaming_other_servers_emoji_reaction: Check network lines and server load as large amounts of data are delivered.
streaming_other_servers_emoji_reaction: Check network lines and server load as large amounts of data are delivered. If the server load is high, try unchecking the box temporarily.
theme: Theme that logged out visitors and new users see.
thumbnail: A roughly 2:1 image displayed alongside your server information.
timeline_preview: Logged out visitors will be able to browse the most recent public posts available on the server.
@ -363,7 +362,7 @@ en:
site_terms: Privacy Policy
site_title: Server name
status_page_url: Status page URL
streaming_emoji_reaction: Enable stamp streaming
streaming_local_emoji_reaction: Streaming stamp related to local users
streaming_other_servers_emoji_reaction: Streaming stamp between other server users
theme: Default theme
thumbnail: Server thumbnail

5
config/locales/simple_form.ja.yml
View file

@ -125,8 +125,7 @@ ja:
site_terms: 独自のプライバシーポリシーを使用するか空白にしてデフォルトのプライバシーポリシーを使用します。Markdownが使えます。
site_title: ドメイン名以外でサーバーを参照する方法
status_page_url: 障害発生時などにユーザーがサーバーの状態を確認できるページのURL
streaming_emoji_reaction: サーバーの負荷が高い場合は一時的にチェックを外してみてください。
streaming_other_servers_emoji_reaction: 大量のデータが配信されるため、ネットワークの回線やサーバーの負荷をチェックしてください。
streaming_other_servers_emoji_reaction: 大量のデータが配信されるため、ネットワークの回線やサーバーの負荷をチェックしてください。サーバーの負荷が高い場合は一時的にチェックを外してみてください。
theme: ログインしていない人と新規ユーザーに表示されるテーマ。
thumbnail: サーバー情報と共に表示される、アスペクト比が約 2:1 の画像。
timeline_preview: ログインしていないユーザーがサーバー上の最新の公開投稿を閲覧できるようにします。
@ -373,7 +372,7 @@ ja:
site_terms: プライバシーポリシー
site_title: サーバーの名前
status_page_url: サーバーの状態ページのURL
streaming_emoji_reaction: スタンプのストリーミングを有効にする
streaming_local_emoji_reaction: ローカルユーザーがつけた、またはローカル投稿についたスタンプをストリーミングする
streaming_other_servers_emoji_reaction: 他のサーバーのユーザーが他のサーバーの投稿につけたスタンプをストリーミングする
theme: デフォルトテーマ
thumbnail: サーバーのサムネイル

2
config/settings.yml
View file

@ -40,7 +40,7 @@ defaults: &defaults
captcha_enabled: false
receive_other_servers_emoji_reaction: false
streaming_other_servers_emoji_reaction: false
streaming_emoji_reaction: true
streaming_local_emoji_reaction: true
enable_emoji_reaction: true
check_lts_version_only: true
enable_public_unlisted_visibility: true