);
export default Logo;
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index a1384ba5838db..f10c29b0cc0a9 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -510,6 +510,7 @@ class Status extends ImmutablePureComponent {
{prepend}
{item.get('body')}
);
+ if (item.get('icon')) {
+ contents.push(
+
+ })
+
+ );
+ }
+
+ const href = item.get('href');
+
+ const classname = classnames({
+ 'announcements2__item': true,
+ 'announcements2__item--clickable': !!href,
+ });
+
+ if (!href) {
+ return ({contents}
);
+ } else if (href.startsWith('/web/')) {
+ return ({contents});
+ } else {
+ return ({contents});
+ }
+ }
+
+}
+
+export default class Announcements extends React.PureComponent {
+
+ state = {
+ items: Announcements.cache || Immutable.Map(),
+ }
+
+ static isCacheControlled = false
+ static lastDate = null
+ static cache = null
+
+ constructor () {
+ super();
+ this.refresh();
+ }
+
+ componentWillUnmount() {
+ this.cancelPolling();
+ }
+
+ setPolling = () => {
+ this.timer = setTimeout(this.refresh, 2 * 60 * 1000);
+ }
+
+ cancelPolling = () => {
+ if (this.timer !== null) {
+ clearTimeout(this.timer);
+ this.timer = null;
+ }
+ }
+
+ deleteServiceWorkerCache = () => {
+ // files in /system/ will be cached by SW
+ if (self.caches) {
+ return caches.open('mastodon-system')
+ .then(cache => cache.delete(window.origin + '/system/announcements.json'))
+ .catch(() => {});
+ } else {
+ return Promise.resolve();
+ }
+ }
+
+ refresh = () => {
+ this.timer = null;
+
+ axios.get('/announcements.json', {
+ headers: {
+ 'If-Modified-Since': !Announcements.isCacheControlled && Announcements.lastDate || '',
+ },
+ })
+ .then(resp => {
+ Announcements.isCacheControlled = !!resp.headers['cache-control'];
+ Announcements.lastDate = resp.headers['last-modified'];
+ return resp;
+ })
+ .then(resp => this.setState({ items: Announcements.cache = Immutable.fromJS(resp.data) || {} }))
+ .catch(err => err.response.status !== 304 && console.warn(err))
+ .then(this.deleteServiceWorkerCache)
+ .then(this.setPolling)
+ .catch(err => err && console.warn(err));
+ }
+
+ render() {
+ const { items } = this.state;
+
+ return (
+ -
+ {items.entrySeq().map(([key, item]) =>
+ (
-
+
+ )
+ )}
+
-
+
{/* eslint-disable-next-line jsx-a11y/no-onchange */}
-