Winify – Diff between revs 77 and 78
?pathlinks?
Rev 77 | Rev 78 | |||
---|---|---|---|---|
Line 53... | Line 53... | |||
53 | |
53 | |
|
Line 54... | Line 54... | |||
54 | private LogViewForm _logViewForm; |
54 | private LogViewForm _logViewForm; |
|
Line 55... | Line 55... | |||
55 | |
55 | |
|
Line 56... | Line 56... | |||
56 | private readonly LogMemorySink _memorySink; |
56 | private readonly LogMemorySink _memorySink; |
|
Line 57... | Line 57... | |||
57 | |
57 | |
|
Line 70... | Line 70... | |||
70 | _cancellationTokenSource = new CancellationTokenSource(); |
70 | _cancellationTokenSource = new CancellationTokenSource(); |
|
71 | _cancellationToken = _cancellationTokenSource.Token; |
71 | _cancellationToken = _cancellationTokenSource.Token; |
|
Line 72... | Line 72... | |||
72 | |
72 | |
|
Line 73... | Line 73... | |||
73 | ChangedConfigurationContinuation = new ScheduledContinuation(); |
73 | ChangedConfigurationContinuation = new ScheduledContinuation(); |
|
74 | |
74 | |
|
Line 75... | Line 75... | |||
75 | _toasts = new Toasts.Toasts(_cancellationToken); |
75 | _toastDisplay = new Toasts.ToastDisplay(_cancellationToken); |
|
76 | } |
76 | } |
|
77 | |
77 | |
|
Line 238... | Line 238... | |||
238 | if (announcement.LingerTime <= 0) |
238 | if (announcement.LingerTime <= 0) |
|
239 | { |
239 | { |
|
240 | return; |
240 | return; |
|
241 | } |
241 | } |
|
Line 242... | Line 242... | |||
242 | |
242 | |
|
- | 243 | await _toastDisplay.Queue( |
||
- | 244 | new ToastDisplayData |
||
243 | var configuredNotification = new ToastForm( |
245 | { |
|
244 | $"{e.Message.Title} ({e.Message.Server.Name}/{e.Message.AppId})", |
246 | Title = $"{e.Message.Title} ({e.Message.Server.Name}/{e.Message.AppId})", |
|
245 | e.Message.Message) |
- | ||
246 | { |
247 | Body = e.Message.Message, |
|
247 | EnableChime = announcement.EnableChime, |
248 | EnableChime = announcement.EnableChime, |
|
248 | Chime = announcement.Chime ?? Configuration.Chime, |
249 | Chime = announcement.Chime ?? Configuration.Chime, |
|
249 | LingerTime = (int)announcement.LingerTime, |
250 | LingerTime = (int)announcement.LingerTime, |
|
- | 251 | Image = e.Image, |
||
250 | Image = e.Image |
252 | Content = e.Message.Extras.GotifyMessageExtrasClientDisplay.ContentType |
|
251 | }; |
- | ||
252 | |
- | ||
Line 253... | Line 253... | |||
253 | await _toasts.Queue(configuredNotification); |
253 | }); |
|
254 | |
254 | |
|
Line 255... | Line 255... | |||
255 | return; |
255 | return; |
|
256 | } |
256 | } |
|
257 | |
257 | |
|
258 | if (Configuration.InfiniteToastDuration) |
- | ||
259 | { |
- | ||
260 | var infiniteToastForm = new ToastForm( |
258 | if (Configuration.InfiniteToastDuration) |
|
- | 259 | { |
||
- | 260 | await _toastDisplay.Queue(new ToastDisplayData |
||
261 | $"{e.Message.Title} ({e.Message.Server.Name}/{e.Message.AppId})", |
261 | { |
|
262 | e.Message.Message) |
262 | Title = $"{e.Message.Title} ({e.Message.Server.Name}/{e.Message.AppId})", |
|
- | 263 | Body = e.Message.Message, |
||
263 | { |
264 | Chime = Configuration.Chime, |
|
264 | Chime = Configuration.Chime, |
- | ||
265 | Image = e.Image |
- | ||
Line 266... | Line 265... | |||
266 | }; |
265 | Image = e.Image, |
|
267 | |
266 | Content = e.Message.Extras.GotifyMessageExtrasClientDisplay.ContentType |
|
Line 268... | Line 267... | |||
268 | await _toasts.Queue(infiniteToastForm); |
267 | }); |
|
269 | |
- | ||
270 | return; |
- | ||
271 | } |
268 | |
|
- | 269 | return; |
||
- | 270 | } |
||
272 | |
271 | |
|
273 | var toastForm = new ToastForm( |
272 | await _toastDisplay.Queue(new ToastDisplayData |
|
274 | $"{e.Message.Title} ({e.Message.Server.Name}/{e.Message.AppId})", |
273 | { |
|
- | 274 | Title = $"{e.Message.Title} ({e.Message.Server.Name}/{e.Message.AppId})", |
||
275 | e.Message.Message) |
275 | Body = e.Message.Message, |
|
276 | { |
- | ||
277 | Chime = Configuration.Chime, |
- | ||
278 | LingerTime = Configuration.ToastDuration, |
276 | Chime = Configuration.Chime, |
|
Line 279... | Line 277... | |||
279 | Image = e.Image |
277 | LingerTime = Configuration.ToastDuration, |
|
280 | }; |
278 | Image = e.Image, |
|
281 | |
279 | Content = e.Message.Extras.GotifyMessageExtrasClientDisplay.ContentType |