Fix things

Author: PineappleIOnic

templates/android/library/src/main/java/io/appwrite/ID.kt.twig

@@ -11,7 +11,7 @@ class ID {
         private fun hexTimestamp(): String {
             val now = Instant.now().toEpochMilli() / 1000.0
             val secondsSinceEpoch = floor(now).toLong()
-            val msecs = ((now - secondsPart) * 1_000_000).toLong()
+            val msecs = ((now - secondsSinceEpoch) * 1_000_000).toLong()
 
             // Convert both parts to hexadecimal format
             val hexTimestamp = "%08x%05x".format(secondsSinceEpoch, msecs)

templates/kotlin/src/main/kotlin/io/appwrite/ID.kt.twig

@@ -5,19 +5,19 @@ import kotlin.math.floor
 import kotlin.random.Random
 
 class ID {
-    // Generate an hex ID based on timestamp
-    // Recreated from https://www.php.net/manual/en/function.uniqid.php
-    private fun hexTimestamp(): String {
-        val now = Instant.now().toEpochMilli() / 1000.0
-        val secondsSinceEpoch = floor(now).toLong()
-        val millisecondsSinceEpoch = ((now - secondsSinceEpoch) * 1_000_000).toLong()
+    companion object {
+        // Generate an hex ID based on timestamp
+        // Recreated from https://www.php.net/manual/en/function.uniqid.php
+        private fun hexTimestamp(): String {
+            val now = Instant.now().toEpochMilli() / 1000.0
+            val secondsSinceEpoch = floor(now).toLong()
+            val msecs = ((now - secondsSinceEpoch) * 1_000_000).toLong()
 
-        // Convert both parts to hexadecimal format
-        val hexTimestamp = "%08x%05x".format(secondsSinceEpoch, millisecondsSinceEpoch)
-        return hexTimestamp
-    }
+            // Convert both parts to hexadecimal format
+            val hexTimestamp = "%08x%05x".format(secondsSinceEpoch, msecs)
+            return hexTimestamp
+        }
 
-    companion object {
         fun custom(id: String): String
             = id
         // Generate a unique ID with padding to have a longer ID

templates/python/package/id.py.twig

@@ -1,4 +1,5 @@
 from datetime import datetime
+import math
 import os
 
 class ID:
@@ -20,6 +21,6 @@ class ID:
     @staticmethod
     def unique(padding = 7):
         base_id = ID.__hex_timestamp()
-        random_bytes = os.urandom(ceil(padding / 2))
+        random_bytes = os.urandom(math.ceil(padding / 2))
         random_padding = random_bytes.hex()[:padding]
         return base_id + random_padding

templates/ruby/lib/container/id.rb.twig

@@ -2,16 +2,6 @@ require 'securerandom'
 
 module {{spec.title | caseUcfirst}}
     class ID
-        #Generate an hex ID based on timestamp
-        #Recreated from https://www.php.net/manual/en/function.uniqid.php
-        private def self.hex_timestamp
-            now = Time.now
-            seconds_since_epoch = now.to_i
-            microseconds_part = now.usec
-            hex_timestamp = "%08x%05x" % [seconds_since_epoch, microseconds_part]
-            hex_timestamp
-        end
-
         def self.custom(id)
             id
         end
@@ -23,5 +13,17 @@ module {{spec.title | caseUcfirst}}
             random_padding = random_padding[0...padding]
             base_id + random_padding
         end
+
+        private
+
+        #Generate an hex ID based on timestamp
+        #Recreated from https://www.php.net/manual/en/function.uniqid.php
+        def self.hex_timestamp
+            now = Time.now
+            seconds_since_epoch = now.to_i
+            microseconds_part = now.usec
+            hex_timestamp = "%08x%05x" % [seconds_since_epoch, microseconds_part]
+            hex_timestamp
+        end
     end
 end

templates/swift/Sources/ID.swift.twig

@@ -3,7 +3,7 @@ import Foundation
 public class ID {
     // Generate an hex ID based on timestamp
     // Recreated from https://www.php.net/manual/en/function.uniqid.php
-    private func hexTimestamp() -> String {
+    private static func hexTimestamp() -> String {
         let now = Date()
         let secondsSinceEpoch = Int(now.timeIntervalSince1970)
         let microsecondsPart = Int((now.timeIntervalSince1970 - Double(secondsSinceEpoch)) * 1_000_000)
@@ -17,7 +17,7 @@ public class ID {
 
     // Generate a unique ID with padding to have a longer ID
     public static func unique(padding: Int = 7) -> String {
-        let baseId = ID.hexTimestamp()
+        let baseId = Self.hexTimestamp()
         let randomPadding = (1...padding).map {
             _ in String(format: "%x", Int.random(in: 0..<16))
         }.joined()