Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
CheckFiles: "launcher.py cogs/"

steps:
- uses: actions/checkout@v4.2.2
- uses: actions/checkout@v5.0.0
with:
ref: ${{ github.head_ref }}

Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4.2.2
- uses: actions/checkout@v5.0.0
- name: Create VARS
id: vars
run: |
Expand Down
12 changes: 11 additions & 1 deletion cogs/misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,9 @@ async def bruker(self, ctx, *, bruker: discord.Member = None):
embed.set_thumbnail(url=bruker.display_avatar.replace(static_format="png").url)
embed.add_field(name="Opprettet", value=bruker_created_date)
embed.add_field(name="Ble med i serveren", value=bruker_joined_date)
if hasattr(bruker.primary_guild, 'tag') and bruker.primary_guild.identity_enabled:
is_star = " :star:" if bruker.primary_guild.id == ctx.guild.id else ""
embed.add_field(name=f"Guild Tag{is_star}", value=f"`{bruker.primary_guild.tag}`")
if bruker.premium_since:
premium_since = discord.utils.format_dt(bruker.premium_since, style="R")
embed.add_field(name="Boost", value=f"{premium_since}\n" +
Expand Down Expand Up @@ -590,13 +593,20 @@ async def rolle(self, ctx, *, rolle: discord.Role):
if len(members) == 0:
members = "**Ingen**"

def colorhexa(color):
return f"[{str(color)}](<https://www.colorhexa.com/{str(color).replace('#', '')}.png>)"

permissions = ", ".join([permission for permission, value in iter(rolle.permissions) if value is True])

embed = discord.Embed(title=rolle.name, description=f"{rolle.mention}\n**ID:** {rolle.id}", color=color)
embed.set_author(name=rolle.guild.name)
if ctx.guild.icon is not None:
embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon.url)
embed.add_field(name="Fargekode", value=str(rolle.color))
embed.add_field(name="Fargekode", value=colorhexa(rolle.color))
if rolle.tertiary_color:
embed.add_field(name="Fargeeffekt", value="Holografisk")
elif rolle.secondary_color:
embed.add_field(name="Tillegsfarge", value=colorhexa(rolle.secondary_color))
embed.add_field(name="Opprettet", value=discord.utils.format_dt(rolle.created_at, style="R"))
embed.add_field(name="Posisjon", value=rolle.position)
embed.add_field(name="Nevnbar", value=mentionable)
Expand Down
2 changes: 1 addition & 1 deletion cogs/utils/Bot_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
bot_version = "0.1.25"
bot_version = "0.1.26"
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
discord.py==2.5.2
discord.py==2.6.0
environs==14.3.0
flask==2.3.3
marshmallow==4.0.0
python-dateutil==2.9.0.post0
requests==2.32.4
requests==2.32.5