Unlabs feature pinning (#22)
This commit is contained in:
@@ -17,7 +17,6 @@ import RightPanelStore from "../../stores/right-panel/RightPanelStore";
|
||||
import MatrixClientContext from "../../contexts/MatrixClientContext";
|
||||
import RoomSummaryCard from "../views/right_panel/RoomSummaryCard";
|
||||
import WidgetCard from "../views/right_panel/WidgetCard";
|
||||
import SettingsStore from "../../settings/SettingsStore";
|
||||
import MemberList from "../views/rooms/MemberList";
|
||||
import UserInfo from "../views/right_panel/UserInfo";
|
||||
import ThirdPartyMemberInfo from "../views/rooms/ThirdPartyMemberInfo";
|
||||
@@ -220,7 +219,7 @@ export default class RightPanel extends React.Component<Props, IState> {
|
||||
break;
|
||||
|
||||
case RightPanelPhases.PinnedMessages:
|
||||
if (!!this.props.room && SettingsStore.getValue("feature_pinning")) {
|
||||
if (!!this.props.room) {
|
||||
card = (
|
||||
<PinnedMessagesCard
|
||||
room={this.props.room}
|
||||
|
||||
@@ -2408,13 +2408,9 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
|
||||
</AuxPanel>
|
||||
);
|
||||
|
||||
const isPinningEnabled = SettingsStore.getValue<boolean>("feature_pinning");
|
||||
let pinnedMessageBanner;
|
||||
if (isPinningEnabled) {
|
||||
pinnedMessageBanner = (
|
||||
<PinnedMessageBanner room={this.state.room} permalinkCreator={this.permalinkCreator} />
|
||||
);
|
||||
}
|
||||
const pinnedMessageBanner = (
|
||||
<PinnedMessageBanner room={this.state.room} permalinkCreator={this.permalinkCreator} />
|
||||
);
|
||||
|
||||
let messageComposer;
|
||||
const showComposer =
|
||||
|
||||
@@ -18,7 +18,6 @@ import DateSeparator from "../../views/messages/DateSeparator";
|
||||
import HistoryTile from "../../views/rooms/HistoryTile";
|
||||
import EventListSummary from "../../views/elements/EventListSummary";
|
||||
import { SeparatorKind } from "../../views/messages/TimelineSeparator";
|
||||
import SettingsStore from "../../../settings/SettingsStore";
|
||||
|
||||
const groupedStateEvents = [
|
||||
EventType.RoomMember,
|
||||
@@ -91,7 +90,7 @@ export class MainGrouper extends BaseGrouper {
|
||||
return;
|
||||
}
|
||||
|
||||
if (ev.getType() === EventType.RoomPinnedEvents && !SettingsStore.getValue("feature_pinning")) {
|
||||
if (ev.getType() === EventType.RoomPinnedEvents) {
|
||||
// If pinned messages are disabled, don't show the summary
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user