New Api Version

Reviewed-on: #8

.drone.status

@@ -1,3 +0,0 @@
-{
-    "url": "https://drone.f-brinker.de/fbrinker/elderscrolls-addon-achievementInfo/"
-}

.drone.yml

@@ -1,59 +0,0 @@
----
-kind: pipeline
-name: default
-
-clone:
-  disable: true
-
-steps:
-- name: clone
-  image: alpine/git
-  commands:
-  - git clone https://git.f-brinker.de/fbrinker/elderscrolls-addon-achievementInfo.git sources
-  - cd sources && git checkout $DRONE_COMMIT
-
-- name: lint
-  image: alpine
-  commands:
-    - apk update
-    - apk add --no-cache build-base curl unzip
-    - apk add --no-cache lua5.1 lua5.1-dev luarocks5.1
-    - luarocks-5.1 install luacheck
-    - cd sources
-    - luacheck ./*.lua
-
-- name: build
-  image: alpine
-  commands:
-    - apk update && apk add --no-cache zip
-    # Delete unneeded files/dirs
-    - rm -rf sources/.git
-    - rm -rf sources/screenshots
-    - rm -f sources/.drone.status
-    - rm -f sources/.drone.yml
-    - rm -f sources/.luacheckrc
-    # Set Version and AddonVersion
-    - export VERSION=$DRONE_TAG
-    - export ADDON_VERSION=$(echo $DRONE_TAG | sed -E 's/(0|)\.//g')
-    - sed -i "s/0.123456789/$VERSION/g" sources/AchievementInfoCommon.lua
-    - sed -i "s/0.123456789/$VERSION/g" sources/AchievementInfo.txt
-    - sed -i "s/0.123456789/$ADDON_VERSION/g" sources/AchievementInfo.txt
-    # Rename and zip
-    - mv sources AchievementInfo
-    - zip -r "AchievementInfo-$DRONE_TAG.zip" ./AchievementInfo
-  when:
-    event: 
-      - tag
-
-- name: release
-  image: plugins/gitea-release
-  settings:
-    base_url: https://git.f-brinker.de
-    api_key:
-      from_secret: gitea_token
-    files: ./*.zip
-    title: AchievementInfo ${DRONE_TAG}
-    note: AchievementInfo/CHANGELOG.md
-  when:
-    event: 
-      - tag

.gitea/workflows/build.yaml

@@ -0,0 +1,55 @@
+name: Workflow
+run-name: ${{ gitea.actor }} is linting and creating a new release on tag pushes 🚀
+on: [push]
+
+jobs:
+
+  Linting:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Run Luacheck linter
+        uses: lunarmodules/luacheck@v1
+
+  Release:
+    needs: [Linting]
+    if: ${{ startsWith(github.ref, 'refs/tags/') }} # only for tags
+    runs-on: ubuntu-latest
+    env:
+      Version: ${{ gitea.ref_name }}
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with:
+          path: sources
+      - name: Delete unneeded files/dirs
+        run: |
+          rm -rf sources/.git
+          rm -rf sources/.gitea
+          rm -rf sources/screenshots
+          rm -f sources/.luacheckrc
+      - name: Set Version and AddonVersion
+        run: |
+          echo "Version: ${{ env.Version }}"
+          export ADDON_VERSION=$(echo ${{ env.Version }} | sed -E 's/(0|)\.//g')
+          sed -i "s/0.123456789/${{ env.Version }}/g" sources/AchievementInfoCommon.lua
+          sed -i "s/0.123456789/${{ env.Version }}/g" sources/AchievementInfo.txt
+          sed -i "s/0.123456789/$ADDON_VERSION/g" sources/AchievementInfo.txt
+      - name: Rename and zip
+        run: |
+          mv sources AchievementInfo
+          zip -r "AchievementInfo-${{ env.Version }}.zip" ./AchievementInfo
+      - name: Create release
+        id: create_release
+        uses: akkuman/gitea-release-action@v1
+        with:
+          token: ${{ secrets.token }}
+          name: "AchievementInfo ${{ env.Version }}"
+          tag_name: "${{ env.Version }}"
+          body_path: AchievementInfo/CHANGELOG.md
+          draft: false
+          prerelease: false
+          sha256sum: true
+          files: |-
+            *.zip

.luacheckrc

@@ -17,7 +17,8 @@ read_globals = {
     "EVENT_ACHIEVEMENT_UPDATED",
     "EVENT_ADD_ON_LOADED",
     "EVENT_MANAGER",
-    "LINK_STYLE_BRACKET",
+    "LINK_STYLE_BRACKETS",
     "zo_callLater",
+    "zo_strformat",
     "ZO_SavedVars",
 }

AchievementInfo.txt

@@ -5,7 +5,7 @@
 ## Author: |c87B7CCAsto|r, @Astarax
 ## Contact: mail@coded-with-heart.com
 
-## APIVersion: 100033
+## APIVersion: 101044
 ## SavedVariables: ACHIEVEMENT_INFO_DB ACHIEVEMENT_INFO_DB_USE_AW
 
 ## DependsOn: LibAddonMenu-2.0

AchievementInfoApplication.lua

@@ -49,7 +49,7 @@ function AchievementInfo.onAchievementUpdated(_, achId)
     local percentageStep        = false
     local percentageStepSize    = AchievementInfo.settingGet("genShowUpdateSteps")
 
-    local link = GetAchievementLink(achId, LINK_STYLE_BRACKET)
+    local link = GetAchievementLink(achId, LINK_STYLE_BRACKETS)
     local catName = "/"
 
     if categoryId ~= false then
@@ -67,13 +67,18 @@ function AchievementInfo.onAchievementUpdated(_, achId)
             tmpOutput = tmpOutput .. ", "
         end
 
-        tmpOutput = tmpOutput .. description .. " "
+        tmpOutput = tmpOutput .. zo_strformat("<<1>>", description) .. " "
         tmpOutput = tmpOutput .. AchievementInfo.calcCriteriaColor(numCompleted, numRequired) .. numCompleted .. "|r"
         tmpOutput = tmpOutput .. AchievementInfo.clrDefault .. "/" .. "|r"
         tmpOutput = tmpOutput .. AchievementInfo.clrCriteriaComplete .. numRequired .. "|r"
         tmpOutput = tmpOutput .. AchievementInfo.clrDefault
 
-        if AchievementInfo.settingGet("genShowOpenDetailsOnly") == true and numCompleted ~= numRequired then
+        if AchievementInfo.settingGet("genShowOpenDetailsOnly") == true then
+            if numCompleted ~= numRequired then
+                detailOutput[detailOutputCount] = tmpOutput
+                detailOutputCount = detailOutputCount + 1
+            end
+        else
             detailOutput[detailOutputCount] = tmpOutput
             detailOutputCount = detailOutputCount + 1
         end

CHANGELOG.md

@@ -1,5 +1,14 @@
 #### Notable Changes
 
+##### Release 4.15
+* Fixed "bracket style" of the achievement links, thanks to DakJaniels
+
+##### Release 4.5
+* Fixed "ShowDetails" option working only in combination with "ShowOpenDetailsOnly"
+
+##### Release 4.3
+* Fixed an error with gendered achievement descriptions
+
 ##### Release 4.0
 * Added accountwide settings
 * Added an "use accountwide settings" option to the settings of each character

README.md

@@ -1,9 +1,13 @@
 # AchievementInfo
 
-[![Build Status](https://drone.f-brinker.de/api/badges/fbrinker/elderscrolls-addon-achievementInfo/status.svg)](https://drone.f-brinker.de/fbrinker/elderscrolls-addon-achievementInfo)
-[![Latest Releases](https://badgen.net/badge/releases/latest)](https://git.f-brinker.de/fbrinker/elderscrolls-addon-achievementInfo/releases)
+[![Version Status](https://monitoring.f-brinker.de/api/badge/18/status?style=plastic&upLabel=Up%20to%20date&downLabel=Outdated)](https://monitoring.f-brinker.de/status/eso)
+[![Build Status](https://git.f-brinker.de/fbrinker/elderscrolls-addon-achievementInfo/actions/workflows/build.yaml/badge.svg)](https://git.f-brinker.de/fbrinker/elderscrolls-addon-achievementInfo/actions)
 
-This is an **The Elderscrolls Online** addon. [See all details and the download @ESOUI](http://www.esoui.com/downloads/info350-AchievementInfo.html#info).
+[![Latest Releases](https://badgen.net/badge/releases/latest)](https://git.f-brinker.de/fbrinker/elderscrolls-addon-achievementInfo/releases)
+[![Downloads](https://badgen.net/https/scripts.f-brinker.de/esoui-stats/badge-total.php?cache=1800)](https://www.esoui.com/downloads/info350-AchievementInfo.html)
+[![Favorites](https://badgen.net/https/scripts.f-brinker.de/esoui-stats/badge-fav.php?cache=1800)](https://www.esoui.com/downloads/info350-AchievementInfo.html)
+
+This is a **The Elderscrolls Online** addon. [See all details and the download @ESOUI](http://www.esoui.com/downloads/info350-AchievementInfo.html#info).
 
 [Issue-Tracker](https://git.f-brinker.de/fbrinker/elderscrolls-addon-achievementInfo/issues)
 
@@ -11,12 +15,12 @@ This is an **The Elderscrolls Online** addon. [See all details and the download
 
 ### What is this AddOn about?
 
-I like achievements and I like to know what to do to complete them and what type of achievements exist without browsing through the entire achievement catalog: This AddOn displays lightweight chat notifications if you make progress in an achievement (please see the screenshots).
+I like achievements, and I like to know what to do to complete them and what type of achievements exist without browsing through the entire achievement catalog: This AddOn displays lightweight chat notifications if you make progress in an achievement (please see the screenshots).
 
 ### Features
 
 * Shows chat notifications if you do something that is needed for an achievement
-* Triggers on each action or just in x% steps of the achievements requirements (configurable)
+* Triggers on each action or just in x% steps of the achievement's requirements (configurable)
 * Can show some details in the chat notification like (kill 250/1000 Humanoids)
 * You can toggle the notifications for each category
 * Lightweight: It is not always present and shows up only when necessary
@@ -31,9 +35,9 @@ I'll still be available here and be able to update the ESOUI page.
 
 ## How to contribute?
 
-**IMPORTANT: Github is a mirror.** Please contribute at [git.f-brinker.de/elderscrolls-addon-achievementInfo](https://git.f-brinker.de/fbrinker/elderscrolls-addon-achievementInfo) - You can login with your Github or Gitlab account (OAuth2).
+**IMPORTANT: Github is a mirror.** Please contribute at [git.f-brinker.de/elderscrolls-addon-achievementInfo](https://git.f-brinker.de/fbrinker/elderscrolls-addon-achievementInfo) - You can log in with your Github or Gitlab account (OAuth2).
 
-Then, create a fork of the repository, do what you have to do and create a pull-request afterwards. Feel free to contact me any time.
+Then, create a fork of the repository, do what you have to do, and create a pull-request afterward. Feel free to contact me any time.
 
 #### Linting
 Luacheck is used to check the LUA code. [Documentation](https://luacheck.readthedocs.io/en/stable/index.html)