Skip to content

DEV: Remove the legacy widget code #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

DEV: Remove the legacy widget code #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed18872
DEV: Remove redundant `post-stream:refresh` event triggers
megothss Sep 18, 2025
b9ffa9a
DEV: Remove `glimmer_post_stream_mode` from tests for simplification
megothss Sep 18, 2025
a6167cf
DEV: Remove deprecated widget overrides and streamline `post` handling
megothss Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 4 additions & 59 deletions assets/javascripts/discourse/initializers/activity-pub-initializer.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import { service } from "@ember/service";
import { hbs } from "ember-cli-htmlbars";
import { Promise } from "rsvp";
import { bind } from "discourse/lib/decorators";
import { withSilencedDeprecations } from "discourse/lib/deprecated";
import { withPluginApi } from "discourse/lib/plugin-api";
import RenderGlimmer from "discourse/widgets/render-glimmer";
import { i18n } from "discourse-i18n";
import ActivityPubPostStatus from "../components/activity-pub-post-status";
import ActivityPubTopicMap from "../components/activity-pub-topic-map";
Expand Down Expand Up @@ -109,14 +106,10 @@ export default {
activity_pub_updated_at: data.model.updated_at,
activity_pub_delivered_at: data.model.delivered_at,
};
topic.postStream
.triggerActivityPubStateChange(data.model.id, props)
.then(() =>
// TODO (glimmer-post-stream) the Glimmer Post Stream does not listen to this event
this.appEvents.trigger("post-stream:refresh", {
id: data.model.id,
})
);
topic.postStream.triggerActivityPubStateChange(
data.model.id,
props
);
this.appEvents.trigger(
"activity-pub:post-updated",
data.model.id,
Expand Down Expand Up @@ -230,52 +223,4 @@ function customizePost(api, container) {
};
}
});

withSilencedDeprecations("discourse.post-stream-widget-overrides", () =>
customizeWidgetPost(api, container)
);
}

function customizeWidgetPost(api, container) {
const currentUser = api.getCurrentUser();
const site = container.lookup("service:site");
const siteSettings = container.lookup("service:site-settings");

api.reopenWidget("post-meta-data", {
html(attrs) {
const result = this._super(attrs);
let postStatuses = result[result.length - 1].children;
postStatuses = postStatuses.filter(
(n) => n.renderInto !== "div.post-info.activity-pub"
);
if (
site.activity_pub_enabled &&
attrs.activity_pub_enabled &&
attrs.post_number !== 1 &&
showStatusToUser(currentUser, siteSettings)
) {
const status = activityPubPostStatus(attrs);
if (status) {
let replyToTabIndex = postStatuses.findIndex((postStatus) => {
return postStatus.name === "reply-to-tab";
});
const post = this.findAncestorModel();
postStatuses.splice(
replyToTabIndex !== -1 ? replyToTabIndex + 1 : 0,
0,
new RenderGlimmer(
this,
"div.post-info.activity-pub",
hbs`<ActivityPubPostStatus @post={{@data.post}} />`,
{
post,
}
)
);
}
}
result[result.length - 1].children = postStatuses;
return result;
},
});
}
Loading