Merge branch 'main' into glitch-soc/merge-upstream
- `.env.production.sample`: Our sample config file is very different from upstream since it is much more complete. Upstream added documentation for a few env variables. Copied the new variables/documentation from upstream. - `app/lib/feed_manager.rb`: Upstream added a timeline type (hashtags), while glitch-soc already had an extra one (direct messages). Not really a conflict but textually close changes. Ported upstream's changes. - `app/models/custom_emoji.rb`: Upstream upped the custom emoji size limit, while glitch-soc had configurable limits. Upped the default limits accordingly. - `streaming/index.js`: Upstream reworked how hastags were normalized. Minor conflict due to glitch-soc's handling of instance-local posts. Ported upstream's changes.
This commit is contained in:
@@ -9,7 +9,7 @@ class FeedInsertWorker
|
||||
@options = options.symbolize_keys
|
||||
|
||||
case @type
|
||||
when :home
|
||||
when :home, :tags
|
||||
@follower = Account.find(id)
|
||||
when :list
|
||||
@list = List.find(id)
|
||||
@@ -38,6 +38,8 @@ class FeedInsertWorker
|
||||
case @type
|
||||
when :home
|
||||
FeedManager.instance.filter?(:home, @status, @follower)
|
||||
when :tags
|
||||
FeedManager.instance.filter?(:tags, @status, @follower)
|
||||
when :list
|
||||
FeedManager.instance.filter?(:list, @status, @list)
|
||||
when :direct
|
||||
@@ -53,7 +55,7 @@ class FeedInsertWorker
|
||||
|
||||
def perform_push
|
||||
case @type
|
||||
when :home
|
||||
when :home, :tags
|
||||
FeedManager.instance.push_to_home(@follower, @status, update: update?)
|
||||
when :list
|
||||
FeedManager.instance.push_to_list(@list, @status, update: update?)
|
||||
@@ -64,7 +66,7 @@ class FeedInsertWorker
|
||||
|
||||
def perform_unpush
|
||||
case @type
|
||||
when :home
|
||||
when :home, :tags
|
||||
FeedManager.instance.unpush_from_home(@follower, @status, update: true)
|
||||
when :list
|
||||
FeedManager.instance.unpush_from_list(@list, @status, update: true)
|
||||
|
||||
Reference in New Issue
Block a user