Merge branch 'main' of github.com:quackduck/devzat

quackduck · Dec 13, 2023 · 85bf197 · 85bf197
2 parents 3623724 + b560c56
commit 85bf197
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml
@@ -20,9 +20,9 @@ jobs:
         with:
           go-version: '>=1.18.0'
           check-latest: true
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3.7.0
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
           version: latest

diff --git a/Admin's Manual.md b/Admin's Manual.md
@@ -122,8 +122,7 @@ discord:
 ```
 
 #### Using the Twitter integration
-
-Devzat supports sending updates about who is online to Twitter. You need to make a new Twitter app through a [Twitter developer account](https://developer.twitter.com/en/apply/user)
+Devzat supports posting updates about who is online to Twitter. Start by creating a new app through a [Twitter developer account](https://developer.twitter.com/en/apply/user) (note: Twitter's API is now paid).
 
 Now add in the relevant keys to your integration config file:
 ```yaml

diff --git a/README.md b/README.md
@@ -130,7 +130,7 @@ The rest
 
 ## Integrations
 
-When self-hosting an instance, Devzat can integrate with Slack and/or Discord to bridge messages, and Twitter to post new-user announcements. 
+When self-hosting an instance, Devzat can integrate with Slack and/or Discord to bridge messages, and Twitter to post new-user announcements.
 See the [Admin's Manual](Admin's%20Manual.md) for more info.
 
 Devzat has a plugin API you can use to integrate your own services: [documentation](plugin/README.md). Feel free to add a plugin to the main instance. Just ask for a token on the server.

diff --git a/mainserver.yml b/mainserver.yml
@@ -28,6 +28,7 @@ admins:
   ee11ee9258594dd7aac18f1fa43d5d32482ec063c86fc3386a058540b4ccbe26: 'Ishan Goel: quackduck'
   3a3534a3d4727957a7e22c05d751d8921ef4a667973bd6d864a40c8ba39b9680: 'PPTide: github.com/PPTide'
   120d352818aef5c2115b32d497253bffc67d26b09e65e8b63ee80f0acc8a8458: 'CaenJones: github.com/CaenJones'
+  d31bbe3dc058a935e29019e59d0c39d1a0a869db9042959198967c1c7b308e6e: 'CaenJones: (server) github.com/CaenJones'
   dfc419ee8fc1a9ec4c608ead49113872ee42d85637faf4d542d72f64415a51e2: 'Alex S: hackclub, github.com/ajs256'
   6acb2173bfe514c32d06639d5c3cac833e8e5a7af608c462cd737cd535bedc4f: 'Ry Hatton, Purdue, github.com/1ryh'
   bed8118812b901da0f3768a2cfd3307ef8ce3597d8bb2095f33bcfcb90da27c7: 'Lukas Krapukaitis, Purdue'