random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

group added to status serialization and old group_id usages changed

Browse Source
This commit is contained in:
2458773093 2019-07-26 21:08:51 +03:00
parent fc4f3f2831
commit c311f6b9d0
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/gabsocial/components/status_action_bar.js
View File

@ -173,13 +173,13 @@ class StatusActionBar extends ImmutablePureComponent {
handleGroupRemoveAccount = () => { handleGroupRemoveAccount = () => {
const { status } = this.props; const { status } = this.props;
this.props.onGroupRemoveAccount(status.get('group_id'), status.getIn(['account', 'id'])); this.props.onGroupRemoveAccount(status.getIn(['group', 'id']), status.getIn(['account', 'id']));
} }
handleGroupRemovePost = () => { handleGroupRemovePost = () => {
const { status } = this.props; const { status } = this.props;
this.props.onGroupRemoveStatus(status.get('group_id'), status.get('id')); this.props.onGroupRemoveStatus(status.getIn(['group', 'id']), status.get('id'));
} }
_makeMenu = (publicStatus) => { _makeMenu = (publicStatus) => {

1
app/models/status.rb
View File

@ -104,6 +104,7 @@ class Status < ApplicationRecord
cache_associated :application, cache_associated :application,
:media_attachments, :media_attachments,
:group,
:conversation, :conversation,
:status_stat, :status_stat,
:tags, :tags,

3
app/serializers/rest/status_serializer.rb
View File

@ -4,7 +4,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id, attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id,
:sensitive, :spoiler_text, :visibility, :language, :sensitive, :spoiler_text, :visibility, :language,
:uri, :url, :replies_count, :reblogs_count, :uri, :url, :replies_count, :reblogs_count,
:favourites_count, :group_id :favourites_count
attribute :favourited, if: :current_user? attribute :favourited, if: :current_user?
attribute :reblogged, if: :current_user? attribute :reblogged, if: :current_user?
@ -17,6 +17,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
belongs_to :reblog, serializer: REST::StatusSerializer belongs_to :reblog, serializer: REST::StatusSerializer
belongs_to :application, if: :show_application? belongs_to :application, if: :show_application?
belongs_to :account, serializer: REST::AccountSerializer belongs_to :account, serializer: REST::AccountSerializer
belongs_to :group, serializer: REST::GroupSerializer
has_many :media_attachments, serializer: REST::MediaAttachmentSerializer has_many :media_attachments, serializer: REST::MediaAttachmentSerializer
has_many :ordered_mentions, key: :mentions has_many :ordered_mentions, key: :mentions