From fca504901f14ca0b4b0bd9431aa1618b1393ad2d Mon Sep 17 00:00:00 2001 From: Svilen Markov <7613769+svilenmarkov@users.noreply.github.com> Date: Fri, 17 May 2024 19:31:03 +0100 Subject: [PATCH 1/5] Create CODE_OF_CONDUCT.md --- CODE_OF_CONDUCT.md | 128 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 00000000..d1b4aaa8 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,128 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +We as members, contributors, and leaders pledge to make participation in our +community a harassment-free experience for everyone, regardless of age, body +size, visible or invisible disability, ethnicity, sex characteristics, gender +identity and expression, level of experience, education, socio-economic status, +nationality, personal appearance, race, religion, or sexual identity +and orientation. + +We pledge to act and interact in ways that contribute to an open, welcoming, +diverse, inclusive, and healthy community. + +## Our Standards + +Examples of behavior that contributes to a positive environment for our +community include: + +* Demonstrating empathy and kindness toward other people +* Being respectful of differing opinions, viewpoints, and experiences +* Giving and gracefully accepting constructive feedback +* Accepting responsibility and apologizing to those affected by our mistakes, + and learning from the experience +* Focusing on what is best not just for us as individuals, but for the + overall community + +Examples of unacceptable behavior include: + +* The use of sexualized language or imagery, and sexual attention or + advances of any kind +* Trolling, insulting or derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or email + address, without their explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Enforcement Responsibilities + +Community leaders are responsible for clarifying and enforcing our standards of +acceptable behavior and will take appropriate and fair corrective action in +response to any behavior that they deem inappropriate, threatening, offensive, +or harmful. + +Community leaders have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, and will communicate reasons for moderation +decisions when appropriate. + +## Scope + +This Code of Conduct applies within all community spaces, and also applies when +an individual is officially representing the community in public spaces. +Examples of representing our community include using an official e-mail address, +posting via an official social media account, or acting as an appointed +representative at an online or offline event. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported to the community leaders responsible for enforcement at +glanceapp@duck.com. +All complaints will be reviewed and investigated promptly and fairly. + +All community leaders are obligated to respect the privacy and security of the +reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining +the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Correction + +**Community Impact**: Use of inappropriate language or other behavior deemed +unprofessional or unwelcome in the community. + +**Consequence**: A private, written warning from community leaders, providing +clarity around the nature of the violation and an explanation of why the +behavior was inappropriate. A public apology may be requested. + +### 2. Warning + +**Community Impact**: A violation through a single incident or series +of actions. + +**Consequence**: A warning with consequences for continued behavior. No +interaction with the people involved, including unsolicited interaction with +those enforcing the Code of Conduct, for a specified period of time. This +includes avoiding interactions in community spaces as well as external channels +like social media. Violating these terms may lead to a temporary or +permanent ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including +sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public +communication with the community for a specified period of time. No public or +private interaction with the people involved, including unsolicited interaction +with those enforcing the Code of Conduct, is allowed during this period. +Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community +standards, including sustained inappropriate behavior, harassment of an +individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within +the community. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], +version 2.0, available at +https://www.contributor-covenant.org/version/2/0/code_of_conduct.html. + +Community Impact Guidelines were inspired by [Mozilla's code of conduct +enforcement ladder](https://github.com/mozilla/diversity). + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see the FAQ at +https://www.contributor-covenant.org/faq. Translations are available at +https://www.contributor-covenant.org/translations. From 566ac99a53b726f5d6a322cf702d6dd4d9710498 Mon Sep 17 00:00:00 2001 From: Svilen Markov <7613769+svilenmarkov@users.noreply.github.com> Date: Fri, 17 May 2024 19:55:34 +0100 Subject: [PATCH 2/5] Move code of conduct --- CODE_OF_CONDUCT.md => .github/CODE_OF_CONDUCT.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename CODE_OF_CONDUCT.md => .github/CODE_OF_CONDUCT.md (100%) diff --git a/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md similarity index 100% rename from CODE_OF_CONDUCT.md rename to .github/CODE_OF_CONDUCT.md From 21d491843febfcececd02f84a713e25d5cd8e5d1 Mon Sep 17 00:00:00 2001 From: Svilen Markov <7613769+svilenmarkov@users.noreply.github.com> Date: Fri, 17 May 2024 19:56:18 +0100 Subject: [PATCH 3/5] Create SECURITY.md --- .github/SECURITY.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .github/SECURITY.md diff --git a/.github/SECURITY.md b/.github/SECURITY.md new file mode 100644 index 00000000..b06a6e32 --- /dev/null +++ b/.github/SECURITY.md @@ -0,0 +1,9 @@ +# Security Policy + +## Supported Versions + +Security updates will be applied to the latest as well as previous minor version release depending on severity and if applicable. + +## Reporting a Vulnerability + +Please report any suspected security vulnerabilities to [glanceapp@duck.com](mailto:glanceapp@duck.com) and do not disclose them publicly. You should receive a response within a few days and if confirmed the issue will be resolved as soon as possible. From 0681a04607ab9502135b6535975af8a4488f07f6 Mon Sep 17 00:00:00 2001 From: fawn Date: Sat, 18 May 2024 03:07:34 +0300 Subject: [PATCH 4/5] Add custom sorting to the twitch channels widget this allows the channels to be sorted as defined in the config while still keeping the live channels on the top. the wording could probably be improved, "custom" is too broad but i'm not sure what else to call it. --- docs/configuration.md | 4 ++++ internal/feed/twitch.go | 6 ++++++ internal/widget/twitch-channels.go | 12 +++++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/docs/configuration.md b/docs/configuration.md index e698fdd7..92dab52e 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -1063,6 +1063,7 @@ Preview: | ---- | ---- | -------- | ------- | | channels | array | yes | | | collapse-after | integer | no | 5 | +| sort-by | string | no | viewers | ##### `channels` A list of channels to display. @@ -1070,6 +1071,9 @@ A list of channels to display. ##### `collapse-after` How many channels are visible before the "SHOW MORE" button appears. Set to `-1` to never collapse. +##### `sort-by` +Can be used to specify the order in which the channels are displayed. Possible values are `viewers` and `custom`. + ### Twitch top games Display a list of games with the most viewers on Twitch. diff --git a/internal/feed/twitch.go b/internal/feed/twitch.go index 1ff82eef..1ce93542 100644 --- a/internal/feed/twitch.go +++ b/internal/feed/twitch.go @@ -44,6 +44,12 @@ func (channels TwitchChannels) SortByViewers() { }) } +func (channels TwitchChannels) SortByLive() { + sort.SliceStable(channels, func(i, j int) bool { + return channels[i].IsLive && !channels[j].IsLive + }) +} + type twitchOperationResponse struct { Data json.RawMessage Extensions struct { diff --git a/internal/widget/twitch-channels.go b/internal/widget/twitch-channels.go index 3f366696..31070814 100644 --- a/internal/widget/twitch-channels.go +++ b/internal/widget/twitch-channels.go @@ -14,6 +14,7 @@ type TwitchChannels struct { ChannelsRequest []string `yaml:"channels"` Channels []feed.TwitchChannel `yaml:"-"` CollapseAfter int `yaml:"collapse-after"` + SortBy string `yaml:"sort-by"` } func (widget *TwitchChannels) Initialize() error { @@ -23,6 +24,10 @@ func (widget *TwitchChannels) Initialize() error { widget.CollapseAfter = 5 } + if widget.SortBy != "viewers" && widget.SortBy != "custom" { + widget.SortBy = "viewers" + } + return nil } @@ -33,7 +38,12 @@ func (widget *TwitchChannels) Update(ctx context.Context) { return } - channels.SortByViewers() + if widget.SortBy == "viewers" { + channels.SortByViewers() + } else if widget.SortBy == "custom" { + channels.SortByLive() + } + widget.Channels = channels } From 5e9635a76feea2ac684e2e3966bb6b43bd6e5ec2 Mon Sep 17 00:00:00 2001 From: Svilen Markov <7613769+svilenmarkov@users.noreply.github.com> Date: Sat, 18 May 2024 11:01:34 +0100 Subject: [PATCH 5/5] Change custom order to live --- docs/configuration.md | 2 +- internal/widget/twitch-channels.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/configuration.md b/docs/configuration.md index 92dab52e..681d3d33 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -1072,7 +1072,7 @@ A list of channels to display. How many channels are visible before the "SHOW MORE" button appears. Set to `-1` to never collapse. ##### `sort-by` -Can be used to specify the order in which the channels are displayed. Possible values are `viewers` and `custom`. +Can be used to specify the order in which the channels are displayed. Possible values are `viewers` and `live`. ### Twitch top games Display a list of games with the most viewers on Twitch. diff --git a/internal/widget/twitch-channels.go b/internal/widget/twitch-channels.go index 31070814..3b728b89 100644 --- a/internal/widget/twitch-channels.go +++ b/internal/widget/twitch-channels.go @@ -24,7 +24,7 @@ func (widget *TwitchChannels) Initialize() error { widget.CollapseAfter = 5 } - if widget.SortBy != "viewers" && widget.SortBy != "custom" { + if widget.SortBy != "viewers" && widget.SortBy != "live" { widget.SortBy = "viewers" } @@ -40,7 +40,7 @@ func (widget *TwitchChannels) Update(ctx context.Context) { if widget.SortBy == "viewers" { channels.SortByViewers() - } else if widget.SortBy == "custom" { + } else if widget.SortBy == "live" { channels.SortByLive() }