mirror of
https://github.com/wassname/talk.git
synced 2026-08-03 13:20:59 +08:00
[CORL 547] org-wide announcements (#2813)
* CRUD announcements * only show announcement if not disabled * make announcements dismissable * add announcement mutations * update announcement form logic * style announcements on stream * update snap * localize strings * close form if announcement is removed * move announcement config below sitewide commenting config * move date calculation inside useMemo * move announcementconfig code to announcementconfigcontainer * use coralContext for localStorage * fix type of announcement createdAt * move announcement form to modal * remove payload pruning from configure route * simplify announcement display logic * make validation message full width Co-authored-by: Kim Gardner <kgardnr@gmail.com>
This commit is contained in:
co-authored by
Kim Gardner
parent
a7b2af85fc
commit
a1a8652f7e
@@ -146,6 +146,7 @@ export type Settings = GlobalModerationSettings &
|
||||
| "stories"
|
||||
| "createdAt"
|
||||
| "slack"
|
||||
| "announcement"
|
||||
> & {
|
||||
/**
|
||||
* auth is the set of configured authentication integrations.
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { isEmpty } from "lodash";
|
||||
import { DateTime } from "luxon";
|
||||
import { Db } from "mongodb";
|
||||
import uuid from "uuid";
|
||||
|
||||
@@ -6,12 +7,14 @@ import { DEFAULT_SESSION_DURATION } from "coral-common/constants";
|
||||
import { LanguageCode } from "coral-common/helpers/i18n/locales";
|
||||
import TIME from "coral-common/time";
|
||||
import { DeepPartial, Omit, Sub } from "coral-common/types";
|
||||
import { isBeforeDate } from "coral-common/utils";
|
||||
import { dotize } from "coral-common/utils/dotize";
|
||||
import { Settings } from "coral-server/models/settings";
|
||||
import { I18n } from "coral-server/services/i18n";
|
||||
import { tenants as collection } from "coral-server/services/mongodb/collections";
|
||||
|
||||
import {
|
||||
GQLAnnouncement,
|
||||
GQLFEATURE_FLAG,
|
||||
GQLMODERATION_MODE,
|
||||
GQLSettings,
|
||||
@@ -396,3 +399,67 @@ export async function disableTenantFeatureFlag(
|
||||
|
||||
return result.value || null;
|
||||
}
|
||||
|
||||
export interface CreateAnnouncementInput {
|
||||
content: string;
|
||||
duration: number;
|
||||
}
|
||||
|
||||
export async function createTenantAnnouncement(
|
||||
mongo: Db,
|
||||
id: string,
|
||||
input: CreateAnnouncementInput,
|
||||
now = new Date()
|
||||
) {
|
||||
const announcement = {
|
||||
id: uuid.v4(),
|
||||
...input,
|
||||
createdAt: now,
|
||||
};
|
||||
|
||||
const result = await collection(mongo).findOneAndUpdate(
|
||||
{ id },
|
||||
{
|
||||
$set: {
|
||||
announcement,
|
||||
},
|
||||
},
|
||||
{
|
||||
returnOriginal: false,
|
||||
}
|
||||
);
|
||||
return result.value;
|
||||
}
|
||||
|
||||
export async function deleteTenantAnnouncement(mongo: Db, id: string) {
|
||||
const result = await collection(mongo).findOneAndUpdate(
|
||||
{ id },
|
||||
{
|
||||
$unset: {
|
||||
announcement: "",
|
||||
},
|
||||
},
|
||||
{
|
||||
returnOriginal: false,
|
||||
}
|
||||
);
|
||||
return result.value;
|
||||
}
|
||||
|
||||
export function retrieveAnnouncementIfEnabled(
|
||||
announcement?: GQLAnnouncement | null
|
||||
) {
|
||||
if (!announcement) {
|
||||
return null;
|
||||
}
|
||||
const disableAt = DateTime.fromJSDate(announcement.createdAt)
|
||||
.plus({ seconds: announcement.duration })
|
||||
.toJSDate();
|
||||
if (isBeforeDate(disableAt)) {
|
||||
return {
|
||||
...announcement,
|
||||
disableAt,
|
||||
};
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user