post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Merge branch 'kb_development_2' into kb_development

Browse source
This commit is contained in:
KMY 2023-08-19 19:35:29 +09:00
commit 43574f9a1e
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/stream.js
View file

@ -107,6 +107,8 @@ const sharedCallbacks = {
return channelName === streamChannelName && params.tag === streamIdentifier; return channelName === streamChannelName && params.tag === streamIdentifier;
} else if (channelName === 'list') { } else if (channelName === 'list') {
return channelName === streamChannelName && params.list === streamIdentifier; return channelName === streamChannelName && params.list === streamIdentifier;
} else if (channelName === 'antenna') {
return channelName === streamChannelName && params.antenna === streamIdentifier;
} }
return false; return false;

4
app/serializers/rest/list_serializer.rb
View file

@ -16,4 +16,8 @@ class REST::ListSerializer < ActiveModel::Serializer
end end
has_many :antennas, serializer: AntennaSerializer has_many :antennas, serializer: AntennaSerializer
def antennas
object.antennas.where(insert_feeds: true)
end
end end