Compare commits

...

21 Commits

Author SHA1 Message Date
CI
a808e5d1a5 chore: release version v1.13.2 2024-10-28 10:52:13 +00:00
Dmitry Popov
b926117e26 Merge branch 'main' of github.com:wanderer-industries/wanderer 2024-10-28 11:51:45 +01:00
Dmitry Popov
fdf238accf chore: release version v1.12.11 2024-10-28 11:51:42 +01:00
CI
4e1c27e8a3 chore: release version v1.13.1 2024-10-28 10:35:24 +00:00
Dmitry Popov
a3e51a0ac5 Merge branch 'main' of github.com:wanderer-industries/wanderer 2024-10-28 11:34:55 +01:00
Dmitry Popov
d27bb0d54f chore: release version v1.12.11 2024-10-28 11:34:52 +01:00
CI
f6a750f06b chore: release version v1.13.0 2024-10-28 10:18:27 +00:00
Dmitry Popov
c4e2f63e69 Merge branch 'main' of github.com:wanderer-industries/wanderer 2024-10-28 11:17:52 +01:00
Dmitry Popov
675ffc8f42 feat(Core): Use ESI /characters/affiliation API
Use ESI /characters/affiliation to fetch characters corporation changes
(1H cached instead of 7D)
2024-10-28 11:17:49 +01:00
CI
cdc4221175 chore: release version v1.12.11 2024-10-25 12:17:07 +00:00
Dmitry Popov
843f3363fd Merge branch 'main' of github.com:wanderer-industries/wanderer 2024-10-25 14:16:32 +02:00
Dmitry Popov
17653a6374 chore: release version v1.12.6 2024-10-25 14:16:28 +02:00
CI
7d860533a0 chore: release version v1.12.10 2024-10-24 20:01:03 +00:00
Dmitry Popov
0c751b3ced Merge branch 'main' of github.com:wanderer-industries/wanderer 2024-10-24 22:00:36 +02:00
Dmitry Popov
80a522ab06 chore: release version v1.12.6 2024-10-24 22:00:33 +02:00
CI
0718d76e00 chore: release version v1.12.9 2024-10-24 19:49:25 +00:00
Dmitry Popov
a4887c5358 Merge branch 'main' of github.com:wanderer-industries/wanderer 2024-10-24 21:48:52 +02:00
Dmitry Popov
2ad5e122ff chore: release version v1.12.6 2024-10-24 21:48:50 +02:00
CI
832d874a0e chore: release version v1.12.8 2024-10-24 19:18:49 +00:00
Dmitry Popov
6a133d4dbd Merge branch 'main' of github.com:wanderer-industries/wanderer 2024-10-24 21:18:07 +02:00
Dmitry Popov
d96dfa63c9 chore: release version v1.12.6 2024-10-24 21:18:03 +02:00
10 changed files with 105 additions and 27 deletions

View File

@@ -148,6 +148,10 @@ jobs:
yes | cp -rf CHANGELOG.md priv/changelog/CHANGELOG.md
sed -i '1i%{title: "Change Log"}\n\n---\n' priv/changelog/CHANGELOG.md
- name: Assign Changelog to step variable
id: changelog-content
run: echo "content=$(cat CHANGELOG.md)" >> $GITHUB_OUTPUT
- name: Get Release Tag
id: get-latest-tag
uses: "WyriHaximus/github-action-get-previous-tag@v1"
@@ -189,6 +193,25 @@ jobs:
- name: Image digest
run: echo ${{ steps.build.outputs.digest }}
- name: Get content
uses: 2428392/gh-truncate-string-action@v1.3.0
id: get-content
with:
stringToTruncate: |
📣 Wanderer new release available 🎉
**Version**: ${{ steps.get-latest-tag.outputs.tag }}
${{ steps.changelog-content.outputs.content }}
maxLength: 2000
truncationSymbol: "..."
- name: Discord Webhook Action
uses: tsickert/discord-webhook@v5.3.0
with:
webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
content: ${{ steps.get-content.outputs.string }}
create-release:
name: 🏷 Create Release
runs-on: ubuntu-22.04

View File

@@ -2,6 +2,45 @@
<!-- changelog -->
## [v1.13.2](https://github.com/wanderer-industries/wanderer/compare/v1.13.1...v1.13.2) (2024-10-28)
## [v1.13.1](https://github.com/wanderer-industries/wanderer/compare/v1.13.0...v1.13.1) (2024-10-28)
## [v1.13.0](https://github.com/wanderer-industries/wanderer/compare/v1.12.11...v1.13.0) (2024-10-28)
### Features:
* Core: Use ESI /characters/affiliation API
## [v1.12.11](https://github.com/wanderer-industries/wanderer/compare/v1.12.10...v1.12.11) (2024-10-25)
## [v1.12.10](https://github.com/wanderer-industries/wanderer/compare/v1.12.9...v1.12.10) (2024-10-24)
## [v1.12.9](https://github.com/wanderer-industries/wanderer/compare/v1.12.8...v1.12.9) (2024-10-24)
## [v1.12.8](https://github.com/wanderer-industries/wanderer/compare/v1.12.7...v1.12.8) (2024-10-24)
## [v1.12.7](https://github.com/wanderer-industries/wanderer/compare/v1.12.6...v1.12.7) (2024-10-24)

View File

@@ -18,7 +18,7 @@ export const useTagMenu = (
ref.current = { onSystemTag, systems, systemId };
return useCallback(() => {
const { onSystemTag, systemId , systems} = ref.current;
const { onSystemTag, systemId, systems } = ref.current;
const system = systemId ? getSystemById(systems, systemId) : undefined;
const isSelectedLetters = AVAILABLE_LETTERS.includes(system?.tag ?? '');

View File

@@ -192,7 +192,7 @@ const MapComp = ({
const { systems = [] } = systemsRef.current;
if (node?.data?.id && !systems.map(s => s.id).includes(node?.data?.id)) {
return [...acc, change];
} else {
} else if (!node?.data?.locked) {
systemsIdsToRemove.push(node?.data?.id);
}
return acc;

View File

@@ -2,23 +2,17 @@ import { Node, useReactFlow } from 'reactflow';
import { useCallback, useRef } from 'react';
import { CommandAddSystems } from '@/hooks/Mapper/types/mapHandlers.ts';
import { convertSystem2Node } from '../../helpers';
import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
export const useMapAddSystems = () => {
const rf = useReactFlow();
const {
data: { systems },
} = useMapRootState();
const ref = useRef({ rf, systems });
ref.current = { systems, rf };
const ref = useRef({ rf });
ref.current = { rf };
return useCallback(
(systems: CommandAddSystems) => {
const nodes = rf.getNodes();
const prepared: Node[] = systems.filter(x => !nodes.some(y => x.id === y.id)).map(convertSystem2Node);
rf.addNodes(prepared);
},
[rf],
);
return useCallback((systems: CommandAddSystems) => {
const { rf } = ref.current;
const nodes = rf.getNodes();
const prepared: Node[] = systems.filter(x => !nodes.some(y => x.id === y.id)).map(convertSystem2Node);
rf.addNodes(prepared);
}, []);
};

View File

@@ -73,7 +73,8 @@ defmodule WandererApp.Character.Tracker do
case WandererApp.Esi.get_character_info(eve_id) do
{:ok, info} ->
{:ok, character_state} = WandererApp.Character.get_character_state(character_id)
update = maybe_update_corporation(character_state, info)
update = maybe_update_corporation(character_state, eve_id |> String.to_integer())
WandererApp.Character.update_character_state(character_id, update)
:ok
@@ -103,7 +104,9 @@ defmodule WandererApp.Character.Tracker do
end
def update_ship(%{character_id: character_id, track_ship: true} = character_state) do
case WandererApp.Character.get_character(character_id) do
character_id
|> WandererApp.Character.get_character()
|> case do
{:ok, %{eve_id: eve_id, access_token: access_token}} when not is_nil(access_token) ->
WandererApp.Cache.has_key?("character:#{character_id}:ship_forbidden")
|> case do
@@ -541,12 +544,17 @@ defmodule WandererApp.Character.Tracker do
defp maybe_update_corporation(
state,
%{
"corporation_id" => corporation_id
} = _info
character_eve_id
)
when not is_nil(corporation_id),
do: update_corporation(state, corporation_id)
when not is_nil(character_eve_id) and is_integer(character_eve_id) do
case WandererApp.Esi.post_characters_affiliation([character_eve_id]) do
{:ok, [character_aff_info]} when not is_nil(character_aff_info) ->
update_corporation(state, character_aff_info |> Map.get("corporation_id"))
error ->
state
end
end
defp maybe_update_corporation(
state,

View File

@@ -5,6 +5,10 @@ defmodule WandererApp.Esi do
defdelegate get_alliance_info(eve_id, opts \\ []), to: WandererApp.Esi.ApiClient
defdelegate get_corporation_info(eve_id, opts \\ []), to: WandererApp.Esi.ApiClient
defdelegate get_character_info(eve_id, opts \\ []), to: WandererApp.Esi.ApiClient
defdelegate post_characters_affiliation(character_eve_ids, opts \\ []),
to: WandererApp.Esi.ApiClient
defdelegate get_character_wallet(character_eve_id, opts \\ []), to: WandererApp.Esi.ApiClient
defdelegate get_corporation_wallets(corporation_id, opts \\ []), to: WandererApp.Esi.ApiClient

View File

@@ -53,6 +53,17 @@ defmodule WandererApp.Esi.ApiClient do
)
end
def post_characters_affiliation(character_eve_ids, _opts)
when is_list(character_eve_ids) do
_post(
"#{@base_url}/characters/affiliation/",
json: character_eve_ids,
params: %{
datasource: "tranquility"
}
)
end
def find_routes(map_id, origin, hubs, routes_settings) do
origin = origin |> String.to_integer()
hubs = hubs |> Enum.map(&(&1 |> String.to_integer()))

View File

@@ -1992,8 +1992,7 @@ defmodule WandererAppWeb.MapLive do
"eve_id" => eve_id,
"name" => name,
"kind" => kind,
"group" => group,
"type" => type
"group" => group
} = signature ->
%{
system_id: system_id,
@@ -2002,7 +2001,7 @@ defmodule WandererAppWeb.MapLive do
description: Map.get(signature, "description"),
kind: kind,
group: group,
type: type,
type: Map.get(signature, "type"),
character_eve_id: character_eve_id
}
end)

View File

@@ -2,7 +2,7 @@ defmodule WandererApp.MixProject do
use Mix.Project
@source_url "https://github.com/wanderer-industries/wanderer"
@version "1.12.7"
@version "1.13.2"
def project do
[